From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 27 May 2015 16:49:29 +0000 (+0200)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~2767
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f9fabb2b;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
	lisp/net/tramp.el
---

f9fabb2bb099d944cc97a87933b86b9eae02d067